Skip to content

[lua] Stop conquest hourly messages in Dynamis - #11404

Merged
Xaver-DaRed merged 1 commit into
LandSandBoat:basefrom
Nobutadas:no-hourly-conquest-dynamis
Sep 7, 2026
Merged

Xaver-DaRed merged 1 commit into
LandSandBoat:basefrom
Nobutadas:no-hourly-conquest-dynamis

Conversation

@Nobutadas

Copy link
Copy Markdown
Contributor

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

The hourly conquest message shouldn't display in Dynamis, only the weekly message. It behaves just like cities.

Weekly update
image

Steps to test these changes

Zone into one of the Dynamis zones. Do !updateconquest 0 to see weekly. Watch the hourly tick over.

@Xaver-DaRed

Copy link
Copy Markdown
Contributor

rebase, please

@Nobutadas
Nobutadas force-pushed the no-hourly-conquest-dynamis branch from a310dad to 3091bc8 Compare September 7, 2026 17:12
Comment thread scripts/globals/conquest.lua Outdated
-- in such cases, owner and influence is undetermined, so we call a city specific method.
local regionId = zone:getRegionID()
if regionId > xi.region.TAVNAZIANARCH and regionId < xi.region.DYNAMIS then
if regionId > xi.region.TAVNAZIANARCH and regionId <= xi.region.DYNAMIS then

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im pretty sure I told you in discord to remove the function from the zone luas?

So this
imagen

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is just redirecting to yet a different global, just replace one with the other. we dont need to short-circuit this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You did, but that was before I realized it sends the weekly update. Just not the hourly.
That was my mistake in Discord. I didn't test enough at first.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want me to fix all of the cities while I'm at it?

@Nobutadas
Nobutadas force-pushed the no-hourly-conquest-dynamis branch from 3091bc8 to 8abf171 Compare September 7, 2026 18:42
@Nobutadas

Copy link
Copy Markdown
Contributor Author

Updated and tested.

Co-Authored-By: Xaver <60053999+Xaver-DaRed@users.noreply.github.com>
auto-merge was automatically disabled September 7, 2026 19:28

Head branch was pushed to by a user without write access

@Nobutadas
Nobutadas force-pushed the no-hourly-conquest-dynamis branch from 8abf171 to ebc2ae6 Compare September 7, 2026 19:28
@Xaver-DaRed
Xaver-DaRed merged commit 00e0d20 into LandSandBoat:base Sep 7, 2026
13 checks passed
@Nobutadas
Nobutadas deleted the no-hourly-conquest-dynamis branch September 8, 2026 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants